From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 15 Sep 2011 17:37:38 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~13
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5d61e48b6882f975a7bd96a7f640c5118beb4915;p=emacs.git

Merge from trunk.
---

5d61e48b6882f975a7bd96a7f640c5118beb4915